From 175800f3457feee54ad17d5cd2d87f748911ecbe Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Sat, 15 Oct 2016 20:38:13 +0100 Subject: [PATCH] Add private header for GtkTextView This allows us to declare the symbols that are currently used inside gtktextdisplay.c without incurring in the wrath of the compiler. --- gtk/Makefile.am | 1 + gtk/gtktextdisplay.c | 4 +--- gtk/gtktextview.c | 3 ++- gtk/gtktextviewprivate.h | 32 ++++++++++++++++++++++++++++++++ 4 files changed, 36 insertions(+), 4 deletions(-) create mode 100644 gtk/gtktextviewprivate.h diff --git a/gtk/Makefile.am b/gtk/Makefile.am index 4b70e99dad..71b0b7583f 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -564,6 +564,7 @@ gtk_private_h_sources = \ gtktexttagprivate.h \ gtktexttypes.h \ gtktextutil.h \ + gtktextviewprivate.h \ gtktrashmonitor.h \ gtktogglebuttonprivate.h \ gtktoolbarprivate.h \ diff --git a/gtk/gtktextdisplay.c b/gtk/gtktextdisplay.c index 99e79cb496..eaa42c1932 100644 --- a/gtk/gtktextdisplay.c +++ b/gtk/gtktextdisplay.c @@ -77,6 +77,7 @@ #include "config.h" #include "gtktextattributesprivate.h" #include "gtktextdisplay.h" +#include "gtktextviewprivate.h" #include "gtkwidgetprivate.h" #include "gtkstylecontextprivate.h" #include "gtkintl.h" @@ -166,9 +167,6 @@ get_item_appearance (PangoItem *item) return NULL; } -extern GtkCssNode *gtk_text_view_get_text_node (GtkTextView *text_view); -extern GtkCssNode *gtk_text_view_get_selection_node (GtkTextView *text_view); - static void gtk_text_renderer_prepare_run (PangoRenderer *renderer, PangoLayoutRun *run) diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c index 10fec27155..f266f0a8a6 100644 --- a/gtk/gtktextview.c +++ b/gtk/gtktextview.c @@ -25,6 +25,8 @@ #include "config.h" +#include "gtktextviewprivate.h" + #include #define GTK_TEXT_USE_INTERNAL_UNSUPPORTED_API @@ -43,7 +45,6 @@ #include "gtkselectionprivate.h" #include "gtktextbufferrichtext.h" #include "gtktextdisplay.h" -#include "gtktextview.h" #include "gtkimmulticontext.h" #include "gtkprivate.h" #include "gtktextutil.h" diff --git a/gtk/gtktextviewprivate.h b/gtk/gtktextviewprivate.h new file mode 100644 index 0000000000..9eddfd81c0 --- /dev/null +++ b/gtk/gtktextviewprivate.h @@ -0,0 +1,32 @@ +/* gtktextviewprivate.h: Private header for GtkTextView + * + * Copyright (c) 2016 Emmanuele Bassi + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see . + */ + +#ifndef __GTK_TEXT_VIEW_PRIVATE_H__ +#define __GTK_TEXT_VIEW_PRIVATE_H__ + +#include "gtktextview.h" +#include "gtkcssnodeprivate.h" + +G_BEGIN_DECLS + +GtkCssNode * gtk_text_view_get_text_node (GtkTextView *text_view); +GtkCssNode * gtk_text_view_get_selection_node (GtkTextView *text_view); + +G_END_DECLS + +#endif /* __GTK_TEXT_VIEW_PRIVATE_H__ */ -- 2.30.2